diff --git a/GeneralMods/AdvancedSaveBackup/AdvancedSaveBackup.csproj b/GeneralMods/AdvancedSaveBackup/AdvancedSaveBackup.csproj index 56a8f844..3b572277 100644 --- a/GeneralMods/AdvancedSaveBackup/AdvancedSaveBackup.csproj +++ b/GeneralMods/AdvancedSaveBackup/AdvancedSaveBackup.csproj @@ -66,12 +66,13 @@ MinimumRecommendedRules.ruleset - + + + 1.2.0 + - - diff --git a/GeneralMods/AdvancedSaveBackup/Framework/ModConfig.cs b/GeneralMods/AdvancedSaveBackup/Framework/ModConfig.cs index be464717..239ba9c8 100644 --- a/GeneralMods/AdvancedSaveBackup/Framework/ModConfig.cs +++ b/GeneralMods/AdvancedSaveBackup/Framework/ModConfig.cs @@ -5,5 +5,14 @@ namespace Omegasis.SaveBackup.Framework { /// The number of save backups to keep for each type. public int SaveCount { get; set; } = 30; + + public bool UseZipCompression { get; set; } = true; + + /// + /// Change this to change where your saves back up. + /// + public string AlternateNightlySaveBackupPath { get; set; } = ""; + + public string AlternatePreplaySaveBackupPath { get; set; } = ""; } } diff --git a/GeneralMods/AdvancedSaveBackup/SaveBackup.cs b/GeneralMods/AdvancedSaveBackup/SaveBackup.cs index 592b6b35..6e9c2747 100644 --- a/GeneralMods/AdvancedSaveBackup/SaveBackup.cs +++ b/GeneralMods/AdvancedSaveBackup/SaveBackup.cs @@ -1,7 +1,9 @@ using System; +using System.Diagnostics; using System.IO; -using System.IO.Compression; + using System.Linq; +using ICSharpCode.SharpZipLib.Zip; using Omegasis.SaveBackup.Framework; using StardewModdingAPI; using StardewModdingAPI.Events; @@ -39,7 +41,14 @@ namespace Omegasis.SaveBackup { this.Config = helper.ReadConfig(); - this.BackupSaves(SaveBackup.PrePlayBackupsPath); + if (string.IsNullOrEmpty(this.Config.AlternatePreplaySaveBackupPath) == false) + { + this.BackupSaves(this.Config.AlternatePreplaySaveBackupPath); + } + else + { + this.BackupSaves(SaveBackup.PrePlayBackupsPath); + } helper.Events.GameLoop.Saving += this.OnSaving; } @@ -53,24 +62,121 @@ namespace Omegasis.SaveBackup /// The event arguments. private void OnSaving(object sender, SavingEventArgs e) { - this.BackupSaves(SaveBackup.NightlyBackupsPath); + if (string.IsNullOrEmpty(this.Config.AlternateNightlySaveBackupPath) == false) + { + this.BackupSaves(this.Config.AlternateNightlySaveBackupPath); + } + else + { + this.BackupSaves(SaveBackup.NightlyBackupsPath); + } } /// Back up saves to the specified folder. /// The folder path in which to generate saves. private void BackupSaves(string folderPath) { - // back up saves - Directory.CreateDirectory(folderPath); - ZipFile.CreateFromDirectory(SaveBackup.SavesPath, Path.Combine(folderPath, $"backup-{DateTime.Now:yyyyMMdd'-'HHmmss}.zip")); + if (this.Config.UseZipCompression == false) + { - // delete old backups - new DirectoryInfo(folderPath) + DirectoryCopy(SaveBackup.SavesPath, Path.Combine(folderPath, $"backup-{DateTime.Now:yyyyMMdd'-'HHmmss}"), true); + new DirectoryInfo(folderPath) + .EnumerateDirectories() + .OrderByDescending(f => f.CreationTime) + .Skip(this.Config.SaveCount) + .ToList() + .ForEach(dir => dir.Delete(true)); + } + else + { + FastZip fastZip = new FastZip(); + fastZip.UseZip64 = UseZip64.Off; + bool recurse = true; // Include all files by recursing through the directory structure + string filter = null; // Dont filter any files at all + fastZip.CreateZip(Path.Combine(folderPath, $"backup-{DateTime.Now:yyyyMMdd'-'HHmmss}.zip"), SaveBackup.SavesPath, recurse, filter); + new DirectoryInfo(folderPath) .EnumerateFiles() .OrderByDescending(f => f.CreationTime) .Skip(this.Config.SaveCount) .ToList() .ForEach(file => file.Delete()); + } + + + /* + // back up saves This used compression but it always causes a library loading issue for OS + Directory.CreateDirectory(folderPath); + ZipFile.CreateFromDirectory(SaveBackup.SavesPath, Path.Combine(folderPath, $"backup-{DateTime.Now:yyyyMMdd'-'HHmmss}.zip")); + + // delete old backups + + */ + } + + /// + /// An uncompressed output method. + /// + /// + /// + /// + private static void DirectoryCopy(string sourceDirName, string destDirName, bool copySubDirs) + { + // Get the subdirectories for the specified directory. + DirectoryInfo dir = new DirectoryInfo(sourceDirName); + + if (!dir.Exists) + { + throw new DirectoryNotFoundException( + "Source directory does not exist or could not be found: " + + sourceDirName); + } + + DirectoryInfo[] dirs = dir.GetDirectories(); + // If the destination directory doesn't exist, create it. + if (!Directory.Exists(destDirName)) + { + Directory.CreateDirectory(destDirName); + } + + // Get the files in the directory and copy them to the new location. + FileInfo[] files = dir.GetFiles(); + foreach (FileInfo file in files) + { + string temppath = Path.Combine(destDirName, file.Name); + file.CopyTo(temppath, false); + } + + // If copying subdirectories, copy them and their contents to new location. + if (copySubDirs) + { + foreach (DirectoryInfo subdir in dirs) + { + string temppath = Path.Combine(destDirName, subdir.Name); + DirectoryCopy(subdir.FullName, temppath, copySubDirs); + } + } + } + + + + /// + ///> + ///This code originated from Pathoschilds SMAPI SaveBackup Mod. All rights for this code goes to them. If this code is not allowed to be here *please* contact Omegasis to discus a proper work around. + /// Create a zip using a process command on MacOS. + /// The file or directory path to zip. + /// The destination file to create. + /// + private void CompressUsingMacProcess(string sourcePath, FileInfo destination) + { + DirectoryInfo saveFolder = new DirectoryInfo(sourcePath); + ProcessStartInfo startInfo = new ProcessStartInfo + { + FileName = "zip", + Arguments = $"-rq \"{destination.FullName}\" \"{saveFolder.Name}\" -x \"*.DS_Store\" -x \"__MACOSX\"", + WorkingDirectory = $"{saveFolder.FullName}/../", + CreateNoWindow = true + }; + new Process { StartInfo = startInfo }.Start(); } } } diff --git a/GeneralMods/AdvancedSaveBackup/manifest.json b/GeneralMods/AdvancedSaveBackup/manifest.json index ca57093f..18d11eeb 100644 --- a/GeneralMods/AdvancedSaveBackup/manifest.json +++ b/GeneralMods/AdvancedSaveBackup/manifest.json @@ -1,7 +1,7 @@ { "Name": "Advanced Save Backup", "Author": "Alpha_Omegasis", - "Version": "1.7.1", + "Version": "1.8.0", "Description": "Backs up your save files when loading SMAPI and every in game night when saving.", "UniqueID": "Omegasis.AdvancedSaveBackup", "EntryDll": "AdvancedSaveBackup.dll", diff --git a/GeneralMods/AutoSpeed/AutoSpeed.csproj b/GeneralMods/AutoSpeed/AutoSpeed.csproj index 46dda84d..424fc406 100644 --- a/GeneralMods/AutoSpeed/AutoSpeed.csproj +++ b/GeneralMods/AutoSpeed/AutoSpeed.csproj @@ -66,7 +66,7 @@ MinimumRecommendedRules.ruleset - + diff --git a/GeneralMods/BillboardAnywhere/BillboardAnywhere.csproj b/GeneralMods/BillboardAnywhere/BillboardAnywhere.csproj index d608676f..acebde09 100644 --- a/GeneralMods/BillboardAnywhere/BillboardAnywhere.csproj +++ b/GeneralMods/BillboardAnywhere/BillboardAnywhere.csproj @@ -66,7 +66,7 @@ MinimumRecommendedRules.ruleset - + diff --git a/GeneralMods/BuildEndurance/BuildEndurance.csproj b/GeneralMods/BuildEndurance/BuildEndurance.csproj index ea68b11c..cc7cde59 100644 --- a/GeneralMods/BuildEndurance/BuildEndurance.csproj +++ b/GeneralMods/BuildEndurance/BuildEndurance.csproj @@ -66,7 +66,7 @@ MinimumRecommendedRules.ruleset - + diff --git a/GeneralMods/BuildHealth/BuildHealth.csproj b/GeneralMods/BuildHealth/BuildHealth.csproj index 2121f301..ea50d0a7 100644 --- a/GeneralMods/BuildHealth/BuildHealth.csproj +++ b/GeneralMods/BuildHealth/BuildHealth.csproj @@ -66,7 +66,7 @@ MinimumRecommendedRules.ruleset - + diff --git a/GeneralMods/BuyBackCollectables/BuyBackCollectables.csproj b/GeneralMods/BuyBackCollectables/BuyBackCollectables.csproj index d1de638c..ab8cc45f 100644 --- a/GeneralMods/BuyBackCollectables/BuyBackCollectables.csproj +++ b/GeneralMods/BuyBackCollectables/BuyBackCollectables.csproj @@ -66,7 +66,7 @@ MinimumRecommendedRules.ruleset - + diff --git a/GeneralMods/Fall28SnowDay/Fall28SnowDay.csproj b/GeneralMods/Fall28SnowDay/Fall28SnowDay.csproj index 9ba5c5f8..bf96a38d 100644 --- a/GeneralMods/Fall28SnowDay/Fall28SnowDay.csproj +++ b/GeneralMods/Fall28SnowDay/Fall28SnowDay.csproj @@ -66,7 +66,7 @@ MinimumRecommendedRules.ruleset - + diff --git a/GeneralMods/HappyBirthday/HappyBirthday.csproj b/GeneralMods/HappyBirthday/HappyBirthday.csproj index ea2baec0..e64ab80e 100644 --- a/GeneralMods/HappyBirthday/HappyBirthday.csproj +++ b/GeneralMods/HappyBirthday/HappyBirthday.csproj @@ -70,7 +70,7 @@ - + diff --git a/GeneralMods/MapEvents/EventSystem.csproj b/GeneralMods/MapEvents/EventSystem.csproj index 9a6a2791..9fcf36de 100644 --- a/GeneralMods/MapEvents/EventSystem.csproj +++ b/GeneralMods/MapEvents/EventSystem.csproj @@ -66,7 +66,7 @@ MinimumRecommendedRules.ruleset - + diff --git a/GeneralMods/MoreRain/MoreRain.csproj b/GeneralMods/MoreRain/MoreRain.csproj index 1e95e354..cdcdaa90 100644 --- a/GeneralMods/MoreRain/MoreRain.csproj +++ b/GeneralMods/MoreRain/MoreRain.csproj @@ -66,7 +66,7 @@ MinimumRecommendedRules.ruleset - + diff --git a/GeneralMods/NightOwl/NightOwl.csproj b/GeneralMods/NightOwl/NightOwl.csproj index 6a78faa1..7bc6e977 100644 --- a/GeneralMods/NightOwl/NightOwl.csproj +++ b/GeneralMods/NightOwl/NightOwl.csproj @@ -66,7 +66,7 @@ MinimumRecommendedRules.ruleset - + diff --git a/GeneralMods/Revitalize/Framework/Minigame/SeasideScrambleMinigame/SeasideScramble.cs b/GeneralMods/Revitalize/Framework/Minigame/SeasideScrambleMinigame/SeasideScramble.cs index 70b9d4b3..17b09220 100644 --- a/GeneralMods/Revitalize/Framework/Minigame/SeasideScrambleMinigame/SeasideScramble.cs +++ b/GeneralMods/Revitalize/Framework/Minigame/SeasideScrambleMinigame/SeasideScramble.cs @@ -532,6 +532,11 @@ namespace Revitalize.Framework.Minigame.SeasideScrambleMinigame return new Vector2(globalPosition.X - (float)SeasideScramble.self.camera.viewport.X, globalPosition.Y - (float)SeasideScramble.self.camera.viewport.Y); } + public bool forceQuit() + { + this.quitGame = true; + } + #endregion } } diff --git a/GeneralMods/Revitalize/Framework/Networking/NetClass.cs b/GeneralMods/Revitalize/Framework/Networking/NetClass.cs new file mode 100644 index 00000000..9b65669f --- /dev/null +++ b/GeneralMods/Revitalize/Framework/Networking/NetClass.cs @@ -0,0 +1,159 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using LiteNetLib.Utils; + +namespace Revitalize.Framework.Networking +{ + public class NetClass: INetSerializable, IComparable + { + /// + /// Strictly used for value types that haven't been casted to NetSerializableObjects + /// + public static Dictionary CastingTypes = new Dictionary() + { + { typeof(string), typeof(NetString) }, + {typeof(int),typeof(NetInt)}, + { typeof(char), typeof(NetChar) }, + { typeof(bool), typeof(NetBool) }, + { typeof(float), typeof(NetFloat) }, + { typeof(double), typeof(NetDouble) }, + { typeof(byte), typeof(NetByte) }, + { typeof(sbyte), typeof(NetSByte) }, + { typeof(Color32), typeof(NetColor32) }, + { typeof(Color), typeof(NetColor) }, + { typeof(Vector3), typeof(NetVector3) }, + { typeof(Vector2), typeof(NetVector2) }, + { typeof(Rect), typeof(NetRectangle) }, + { typeof(short), typeof(NetShort) }, + { typeof(ushort), typeof(NetUShort) }, + { typeof(long), typeof(NetLong) }, + { typeof(ulong), typeof(NetULong) }, + { typeof(uint), typeof(NetUInt) }, + }; + + + public NetDictionary extraVariables; + + private Guid _guid; + + public virtual Guid GUID + { + get + { + if (this._guid == Guid.Empty) + { + this._guid = Guid.NewGuid(); + } + return this._guid; + } + set + { + this._guid = value; + } + } + + public NetClass() + { + this._guid = Guid.NewGuid(); + } + + + public virtual void Deserialize(NetDataReader reader) + { + if (extraVariables == null) this.extraVariables = new NetDictionary(); + this.extraVariables.Deserialize(reader); + this.GUID = reader.GetGuid(); + } + + public virtual void Serialize(NetDataWriter writer) + { + if (extraVariables == null) this.extraVariables = new NetDictionary(); + this.extraVariables.Serialize(writer); + writer.Put(this.GUID); + } + + /// + /// Adds an extra variable to the net class. + /// + /// + /// + public virtual void addExtraVariable(string Key, object obj) + { + NetString str = GameManager.Self.serializer.ToJSONString(obj); + if (this.extraVariables == null) + { + this.extraVariables = new NetDictionary(); + } + this.extraVariables.Add(Key, str); + } + + + /// + /// Gets the extra variable from the net class. + /// + /// + /// + /// + public virtual T getExtraVariable(string Key) + { + if (this.extraVariables.ContainsKey(Key)) + { + T obj = GameManager.Self.serializer.DeserializeFromJSONString(this.extraVariables[Key]); + return obj; + } + else return default(T); + } + + /// + /// Removes an extra variable added to this net class. + /// + /// + /// + public virtual bool removeExtraVariable(string Key) + { + return this.extraVariables.Remove(Key); + } + + /// + /// Attemps to cast data that does not inherit from NetSerializableObject to their respective NetSerializable types. Should really only be used for C# value types and some Unity Engine Types. + /// + /// + /// + public static NetClass CastNonNetData(object Data) + { + Type nonNetType = Data.GetType(); + if (CastingTypes.ContainsKey(nonNetType)) + { + Type netType = CastingTypes[Data.GetType()]; + object v = Activator.CreateInstance(netType, new object[] { Data }); + return (NetClass)v; + } + return null; + } + + public static T Deserialize(NetDataReader Reader) where T : NetClass, new() + { + Type nonNetType = typeof(T); + if (CastingTypes.ContainsKey(nonNetType)) + { + object v = Activator.CreateInstance(nonNetType, new object[] { }); + return (T)v; + } + return null; + } + + public virtual int CompareTo(object obj) + { + if (obj == null) return 1; + + NetClass other = obj as NetClass; + if (other != null) + return this.GUID.CompareTo(other.GUID); + else + throw new ArgumentException("Object is not a valid Net matching class!"); + } + } +} diff --git a/GeneralMods/Revitalize/Framework/Objects/CustomObject.cs b/GeneralMods/Revitalize/Framework/Objects/CustomObject.cs index 60a4f39b..af0e6cfa 100644 --- a/GeneralMods/Revitalize/Framework/Objects/CustomObject.cs +++ b/GeneralMods/Revitalize/Framework/Objects/CustomObject.cs @@ -285,7 +285,7 @@ namespace Revitalize.Framework.Objects : base.getBoundingBox(tileLocation); } - public override int sellToStorePrice() + public override int sellToStorePrice(long PlayerID=-1) { return this.Price; } @@ -712,6 +712,7 @@ namespace Revitalize.Framework.Objects return base.canStackWith(other); } + //~~~~~~~~~~~~~~~~~~~~~~~~~// // PyTk Functions // //~~~~~~~~~~~~~~~~~~~~~~~~~// diff --git a/GeneralMods/Revitalize/Framework/Utilities/Serialization/Serialization.cs b/GeneralMods/Revitalize/Framework/Utilities/Serialization/Serialization.cs index 01b0effb..2cdda4f9 100644 --- a/GeneralMods/Revitalize/Framework/Utilities/Serialization/Serialization.cs +++ b/GeneralMods/Revitalize/Framework/Utilities/Serialization/Serialization.cs @@ -424,11 +424,6 @@ namespace Revitalize.Framework.Utilities /// An object of specified type T. public T Deserialize(string p) { - string json = ""; - foreach (string line in File.ReadLines(p)) - { - json += line; - } using (StreamReader sw = new StreamReader(p)) using (JsonReader reader = new JsonTextReader(sw)) { @@ -446,11 +441,6 @@ namespace Revitalize.Framework.Utilities /// An object of specified type T. public object Deserialize(string p, Type T) { - string json = ""; - foreach (string line in File.ReadLines(p)) - { - json += line; - } using (StreamReader sw = new StreamReader(p)) using (JsonReader reader = new JsonTextReader(sw)) { diff --git a/GeneralMods/Revitalize/Revitalize.csproj b/GeneralMods/Revitalize/Revitalize.csproj index 86c29d0d..c8e46601 100644 --- a/GeneralMods/Revitalize/Revitalize.csproj +++ b/GeneralMods/Revitalize/Revitalize.csproj @@ -34,9 +34,12 @@ 12.0.1 - + + + ..\..\..\LiteNetLib\LiteNetLib.dll + $(GamePath)\Mods\PyTK\PyTK.dll @@ -663,6 +666,7 @@ + diff --git a/GeneralMods/SaveAnywhere/SaveAnywhere.csproj b/GeneralMods/SaveAnywhere/SaveAnywhere.csproj index 0fa017e3..d890a5d8 100644 --- a/GeneralMods/SaveAnywhere/SaveAnywhere.csproj +++ b/GeneralMods/SaveAnywhere/SaveAnywhere.csproj @@ -66,7 +66,7 @@ MinimumRecommendedRules.ruleset - + diff --git a/GeneralMods/SimpleSoundManager/SimpleSoundManager.csproj b/GeneralMods/SimpleSoundManager/SimpleSoundManager.csproj index f7060a80..e3289519 100644 --- a/GeneralMods/SimpleSoundManager/SimpleSoundManager.csproj +++ b/GeneralMods/SimpleSoundManager/SimpleSoundManager.csproj @@ -66,7 +66,7 @@ MinimumRecommendedRules.ruleset - + diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj index 9228b823..cd0dd5fc 100644 --- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj +++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj @@ -68,7 +68,7 @@ - + diff --git a/GeneralMods/StardustCore/Animations/Animation.cs b/GeneralMods/StardustCore/Animations/Animation.cs index 1180b575..02aed11b 100644 --- a/GeneralMods/StardustCore/Animations/Animation.cs +++ b/GeneralMods/StardustCore/Animations/Animation.cs @@ -14,7 +14,8 @@ namespace StardustCore.Animations public int frameDuration; /// The duration until the next frame. - public int frameCountUntilNextAnimation; + private int frameCountUntilNextAnimation; + [XmlIgnore] public NetFields NetFields { get; } = new NetFields(); @@ -67,5 +68,9 @@ namespace StardustCore.Animations { this.frameCountUntilNextAnimation = this.frameDuration; } + public bool finished() + { + return this.frameCountUntilNextAnimation == 0; + } } } diff --git a/GeneralMods/StardustCore/Animations/AnimationManager.cs b/GeneralMods/StardustCore/Animations/AnimationManager.cs index 5a37d561..c6d60ecb 100644 --- a/GeneralMods/StardustCore/Animations/AnimationManager.cs +++ b/GeneralMods/StardustCore/Animations/AnimationManager.cs @@ -13,7 +13,7 @@ namespace StardustCore.Animations { public Dictionary> animations = new SerializableDictionary>(); public string currentAnimationName; - public int currentAnimationListIndex; + private int currentAnimationListIndex; public List currentAnimationList = new List(); public Texture2DExtended objectTexture; ///Might not be necessary if I use the CoreObject texture sheet. public Animation defaultDrawFrame; @@ -126,7 +126,7 @@ namespace StardustCore.Animations { if (this.currentAnimation.frameDuration == -1 || !this.enabled || this.currentAnimation == this.defaultDrawFrame) return; //This is if this is a default animation or the animation stops here. - if (this.currentAnimation.frameCountUntilNextAnimation == 0) + if (this.currentAnimation.finished()) this.getNextAnimationFrame(); this.currentAnimation.tickAnimationFrame(); //this.requiresUpdate = true; diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/0.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/0.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/0.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/0.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/1.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/1.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/1.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/1.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/2.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/2.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/2.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/2.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/3.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/3.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/3.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/3.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/4.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/4.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/4.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/4.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/5.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/5.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/5.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/5.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/6.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/6.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/6.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/6.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/7.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/7.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/7.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/7.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/8.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/8.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/8.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/8.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/9.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/9.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/9.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/9.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/ampersand.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/ampersand.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/ampersand.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/ampersand.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/asterisk.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/asterisk.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/asterisk.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/asterisk.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/backSlash.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/backSlash.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/backSlash.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/backSlash.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/blankBackground.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/blankBackground.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/blankBackground.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/blankBackground.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalA.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalA.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalA.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalA.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalB.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalB.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalB.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalB.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalC.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalC.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalC.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalC.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalD.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalD.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalD.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalD.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalE.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalE.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalE.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalE.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalF.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalF.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalF.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalF.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalG.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalG.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalG.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalG.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalH.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalH.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalH.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalH.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalI.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalI.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalI.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalI.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalJ.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalJ.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalJ.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalJ.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalK.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalK.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalK.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalK.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalL.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalL.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalL.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalL.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalM.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalM.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalM.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalM.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalN.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalN.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalN.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalN.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalO.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalO.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalO.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalO.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalP.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalP.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalP.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalP.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalQ.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalQ.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalQ.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalQ.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalR.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalR.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalR.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalR.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalS.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalS.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalS.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalS.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalT.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalT.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalT.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalT.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalU.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalU.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalU.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalU.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalV.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalV.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalV.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalV.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalW.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalW.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalW.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalW.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalX.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalX.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalX.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalX.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalY.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalY.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalY.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalY.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalZ.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalZ.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/capitalZ.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/capitalZ.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/caret.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/caret.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/caret.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/caret.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/coin.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/coin.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/coin.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/coin.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/colon.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/colon.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/colon.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/colon.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/comma.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/comma.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/comma.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/comma.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/doubleQuotes.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/doubleQuotes.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/doubleQuotes.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/doubleQuotes.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/exclamationMark.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/exclamationMark.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/exclamationMark.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/exclamationMark.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/forwardSlash.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/forwardSlash.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/forwardSlash.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/forwardSlash.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/grave.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/grave.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/grave.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/grave.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/heart.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/heart.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/heart.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/heart.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/leftArrow.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/leftArrow.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/leftArrow.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/leftArrow.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/leftBracket.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/leftBracket.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/leftBracket.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/leftBracket.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/leftCurlyBracket.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/leftCurlyBracket.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/leftCurlyBracket.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/leftCurlyBracket.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/leftParenthesis.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/leftParenthesis.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/leftParenthesis.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/leftParenthesis.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseA.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseA.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseA.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseA.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseB.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseB.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseB.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseB.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseC.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseC.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseC.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseC.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseD.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseD.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseD.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseD.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseE.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseE.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseE.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseE.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseF.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseF.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseF.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseF.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseG.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseG.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseG.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseG.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseH.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseH.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseH.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseH.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseI.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseI.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseI.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseI.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseJ.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseJ.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseJ.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseJ.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseK.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseK.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseK.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseK.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseL.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseL.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseL.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseL.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseM.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseM.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseM.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseM.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseN.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseN.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseN.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseN.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseO.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseO.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseO.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseO.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseP.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseP.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseP.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseP.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseQ.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseQ.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseQ.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseQ.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseR.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseR.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseR.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseR.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseS.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseS.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseS.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseS.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseT.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseT.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseT.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseT.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseU.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseU.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseU.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseU.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseV.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseV.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseV.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseV.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseW.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseW.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseW.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseW.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseX.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseX.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseX.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseX.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseY.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseY.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseY.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseY.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseZ.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseZ.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/lowercaseZ.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/lowercaseZ.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/minus.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/minus.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/minus.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/minus.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/percent.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/percent.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/percent.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/percent.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/period.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/period.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/period.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/period.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/plus.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/plus.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/plus.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/plus.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/pound.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/pound.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/pound.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/pound.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/questionMark.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/questionMark.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/questionMark.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/questionMark.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/rightArrow.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/rightArrow.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/rightArrow.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/rightArrow.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/rightBracket.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/rightBracket.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/rightBracket.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/rightBracket.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/rightCurlyBracket.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/rightCurlyBracket.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/rightCurlyBracket.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/rightCurlyBracket.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/rightParenthesis.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/rightParenthesis.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/rightParenthesis.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/rightParenthesis.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/semicolon.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/semicolon.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/semicolon.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/semicolon.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/singleQuote.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/singleQuote.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/singleQuote.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/singleQuote.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/space.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/space.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/space.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/space.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/star.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/star.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/star.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/star.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/tilde.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/tilde.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/tilde.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/tilde.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/underScore.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/underScore.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/underScore.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/underScore.png diff --git a/GeneralMods/StardustCore/Content/Fonts/Vanilla/verticalLine.png b/GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/verticalLine.png similarity index 100% rename from GeneralMods/StardustCore/Content/Fonts/Vanilla/verticalLine.png rename to GeneralMods/StardustCore/ModAssets/Fonts/Vanilla/verticalLine.png diff --git a/GeneralMods/StardustCore/Content/Graphics/Icons/Prismatic Star Big.png b/GeneralMods/StardustCore/ModAssets/Graphics/Icons/Prismatic Star Big.png similarity index 100% rename from GeneralMods/StardustCore/Content/Graphics/Icons/Prismatic Star Big.png rename to GeneralMods/StardustCore/ModAssets/Graphics/Icons/Prismatic Star Big.png diff --git a/GeneralMods/StardustCore/Content/Graphics/Icons/Prismatic Star.png b/GeneralMods/StardustCore/ModAssets/Graphics/Icons/Prismatic Star.png similarity index 100% rename from GeneralMods/StardustCore/Content/Graphics/Icons/Prismatic Star.png rename to GeneralMods/StardustCore/ModAssets/Graphics/Icons/Prismatic Star.png diff --git a/GeneralMods/StardustCore/Content/Graphics/MultiTest/Test1.png b/GeneralMods/StardustCore/ModAssets/Graphics/MultiTest/Test1.png similarity index 100% rename from GeneralMods/StardustCore/Content/Graphics/MultiTest/Test1.png rename to GeneralMods/StardustCore/ModAssets/Graphics/MultiTest/Test1.png diff --git a/GeneralMods/StardustCore/Content/Graphics/MultiTest/Test2.png b/GeneralMods/StardustCore/ModAssets/Graphics/MultiTest/Test2.png similarity index 100% rename from GeneralMods/StardustCore/Content/Graphics/MultiTest/Test2.png rename to GeneralMods/StardustCore/ModAssets/Graphics/MultiTest/Test2.png diff --git a/GeneralMods/StardustCore/Content/Graphics/MultiTest/Test3.png b/GeneralMods/StardustCore/ModAssets/Graphics/MultiTest/Test3.png similarity index 100% rename from GeneralMods/StardustCore/Content/Graphics/MultiTest/Test3.png rename to GeneralMods/StardustCore/ModAssets/Graphics/MultiTest/Test3.png diff --git a/GeneralMods/StardustCore/Content/Graphics/Tools/CustomAxe.png b/GeneralMods/StardustCore/ModAssets/Graphics/Tools/CustomAxe.png similarity index 100% rename from GeneralMods/StardustCore/Content/Graphics/Tools/CustomAxe.png rename to GeneralMods/StardustCore/ModAssets/Graphics/Tools/CustomAxe.png diff --git a/GeneralMods/StardustCore/StardustCore.csproj b/GeneralMods/StardustCore/StardustCore.csproj index 2dd75a66..aee80fb8 100644 --- a/GeneralMods/StardustCore/StardustCore.csproj +++ b/GeneralMods/StardustCore/StardustCore.csproj @@ -69,7 +69,7 @@ - + @@ -171,306 +171,306 @@ - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - - - + + + Always - + Always - + Always - + PreserveNewest diff --git a/GeneralMods/TimeFreeze/TimeFreeze.csproj b/GeneralMods/TimeFreeze/TimeFreeze.csproj index 091ef460..16c3f7b8 100644 --- a/GeneralMods/TimeFreeze/TimeFreeze.csproj +++ b/GeneralMods/TimeFreeze/TimeFreeze.csproj @@ -66,7 +66,7 @@ MinimumRecommendedRules.ruleset - + diff --git a/GeneralMods/Vocalization/Vocalization/Vocalization.csproj b/GeneralMods/Vocalization/Vocalization/Vocalization.csproj index 62287599..8ee0f313 100644 --- a/GeneralMods/Vocalization/Vocalization/Vocalization.csproj +++ b/GeneralMods/Vocalization/Vocalization/Vocalization.csproj @@ -30,7 +30,7 @@ 4 - +