diff --git a/GeneralMods/HappyBirthday/BirthdayMessages.cs b/GeneralMods/HappyBirthday/BirthdayMessages.cs index d5b04aea..145c76a5 100644 --- a/GeneralMods/HappyBirthday/BirthdayMessages.cs +++ b/GeneralMods/HappyBirthday/BirthdayMessages.cs @@ -1961,7 +1961,7 @@ namespace Omegasis.HappyBirthday serializer.Formatting = Formatting.Indented; string birthdayFileDict = HappyBirthday.Config.translationInfo.getJSONForTranslation("BirthdayWishes", HappyBirthday.Config.translationInfo.CurrentTranslation); - string path = Path.Combine("Content", "Dialogue", HappyBirthday.Config.translationInfo.getFileExtentionForDirectory(Framework.TranslationInfo.LanguageName.English), birthdayFileDict); + string path = Path.Combine("ModAssets", "Dialogue", HappyBirthday.Config.translationInfo.getFileExtentionForDirectory(Framework.TranslationInfo.LanguageName.English), birthdayFileDict); //Handle normal birthday wishes. if (!File.Exists(Path.Combine(HappyBirthday.ModHelper.DirectoryPath, path))) @@ -1975,7 +1975,7 @@ namespace Omegasis.HappyBirthday //handle spouse birthday wishes. string spouseBirthdayFileDict = HappyBirthday.Config.translationInfo.getJSONForTranslation("SpouseBirthdayWishes", HappyBirthday.Config.translationInfo.CurrentTranslation); - string spousePath = Path.Combine("Content", "Dialogue", HappyBirthday.Config.translationInfo.getFileExtentionForDirectory(HappyBirthday.Config.translationInfo.CurrentTranslation), spouseBirthdayFileDict); + string spousePath = Path.Combine("ModAssets", "Dialogue", HappyBirthday.Config.translationInfo.getFileExtentionForDirectory(HappyBirthday.Config.translationInfo.CurrentTranslation), spouseBirthdayFileDict); if (!File.Exists(Path.Combine(HappyBirthday.ModHelper.DirectoryPath, spousePath))) { HappyBirthday.ModMonitor.Log("Creating Spouse Messages", StardewModdingAPI.LogLevel.Alert); @@ -1991,13 +1991,13 @@ namespace Omegasis.HappyBirthday if (translation.Key == Framework.TranslationInfo.LanguageName.English) continue; - string basePath = Path.Combine(HappyBirthday.ModHelper.DirectoryPath, "Content", "Dialogue", HappyBirthday.Config.translationInfo.getFileExtentionForDirectory(translation.Key)); + string basePath = Path.Combine(HappyBirthday.ModHelper.DirectoryPath, "ModAssets", "Dialogue", HappyBirthday.Config.translationInfo.getFileExtentionForDirectory(translation.Key)); if (!Directory.Exists(basePath)) { Directory.CreateDirectory(basePath); } - string tempBirthdayFile = Path.Combine("Content", "Dialogue", HappyBirthday.Config.translationInfo.getFileExtentionForDirectory(translation.Key), HappyBirthday.Config.translationInfo.getJSONForTranslation("BirthdayWishes", translation.Key)); - string tempSpouseBirthdayFile = Path.Combine("Content", "Dialogue", HappyBirthday.Config.translationInfo.getFileExtentionForDirectory(translation.Key), HappyBirthday.Config.translationInfo.getJSONForTranslation("SpouseBirthdayWishes", translation.Key)); + string tempBirthdayFile = Path.Combine("ModAssets", "Dialogue", HappyBirthday.Config.translationInfo.getFileExtentionForDirectory(translation.Key), HappyBirthday.Config.translationInfo.getJSONForTranslation("BirthdayWishes", translation.Key)); + string tempSpouseBirthdayFile = Path.Combine("ModAssets", "Dialogue", HappyBirthday.Config.translationInfo.getFileExtentionForDirectory(translation.Key), HappyBirthday.Config.translationInfo.getJSONForTranslation("SpouseBirthdayWishes", translation.Key)); Dictionary tempBirthdayDict = new Dictionary(); @@ -2057,8 +2057,8 @@ namespace Omegasis.HappyBirthday StardewValley.LocalizedContentManager.LanguageCode code = translation.Value; - string basePath = Path.Combine(HappyBirthday.ModHelper.DirectoryPath, "Content", "Dialogue", HappyBirthday.Config.translationInfo.getFileExtentionForDirectory(translation.Key)); - string stringsFile = Path.Combine("Content", "Dialogue", HappyBirthday.Config.translationInfo.getFileExtentionForDirectory(translation.Key), HappyBirthday.Config.translationInfo.getJSONForTranslation("TranslatedStrings", translation.Key)); + string basePath = Path.Combine(HappyBirthday.ModHelper.DirectoryPath, "ModAssets", "Dialogue", HappyBirthday.Config.translationInfo.getFileExtentionForDirectory(translation.Key)); + string stringsFile = Path.Combine("ModAssets", "Dialogue", HappyBirthday.Config.translationInfo.getFileExtentionForDirectory(translation.Key), HappyBirthday.Config.translationInfo.getJSONForTranslation("TranslatedStrings", translation.Key)); if (!File.Exists(Path.Combine(HappyBirthday.ModHelper.DirectoryPath, stringsFile))) diff --git a/GeneralMods/HappyBirthday/GiftManager.cs b/GeneralMods/HappyBirthday/GiftManager.cs index 5157cce9..cc747858 100644 --- a/GeneralMods/HappyBirthday/GiftManager.cs +++ b/GeneralMods/HappyBirthday/GiftManager.cs @@ -87,7 +87,7 @@ namespace Omegasis.HappyBirthday /// Load birthday gift information from disk. Preferably from BirthdayGift.json in the mod's directory. public void loadVillagerBirthdayGifts() { - string villagerGifts = Path.Combine("Content", "Gifts", "BirthdayGifts.json"); + string villagerGifts = Path.Combine("ModAssets", "Gifts", "BirthdayGifts.json"); if (!HappyBirthday.Config.useLegacyBirthdayFiles) { @@ -122,7 +122,7 @@ namespace Omegasis.HappyBirthday /// Used to load spouse birthday gifts from disk. public void loadSpouseBirthdayGifts() { - string spouseGifts = Path.Combine("Content", "Gifts", "SpouseBirthdayGifts.json"); + string spouseGifts = Path.Combine("ModAssets", "Gifts", "SpouseBirthdayGifts.json"); if (File.Exists(Path.Combine(HappyBirthday.ModHelper.DirectoryPath, spouseGifts))) { HappyBirthday.ModMonitor.Log("Load from SpouseBirthdayGifts.json"); diff --git a/GeneralMods/HappyBirthday/HappyBirthday.csproj b/GeneralMods/HappyBirthday/HappyBirthday.csproj index ea2baec0..34b4c42f 100644 --- a/GeneralMods/HappyBirthday/HappyBirthday.csproj +++ b/GeneralMods/HappyBirthday/HappyBirthday.csproj @@ -100,8 +100,8 @@ - - + + diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/de-DE/BirthdayWishes.de-DE.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/de-DE/BirthdayWishes.de-DE.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/de-DE/BirthdayWishes.de-DE.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/de-DE/BirthdayWishes.de-DE.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/de-DE/SpouseBirthdayWishes.de-DE.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/de-DE/SpouseBirthdayWishes.de-DE.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/de-DE/SpouseBirthdayWishes.de-DE.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/de-DE/SpouseBirthdayWishes.de-DE.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/de-DE/TranslatedStrings.de-DE.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/de-DE/TranslatedStrings.de-DE.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/de-DE/TranslatedStrings.de-DE.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/de-DE/TranslatedStrings.de-DE.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/es-ES/BirthdayWishes.es-ES.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/es-ES/BirthdayWishes.es-ES.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/es-ES/BirthdayWishes.es-ES.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/es-ES/BirthdayWishes.es-ES.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/es-ES/SpouseBirthdayWishes.es-ES.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/es-ES/SpouseBirthdayWishes.es-ES.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/es-ES/SpouseBirthdayWishes.es-ES.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/es-ES/SpouseBirthdayWishes.es-ES.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/es-ES/TranslatedStrings.es-ES.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/es-ES/TranslatedStrings.es-ES.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/es-ES/TranslatedStrings.es-ES.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/es-ES/TranslatedStrings.es-ES.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/fr-FR/BirthdayWishes.fr-FR.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/fr-FR/BirthdayWishes.fr-FR.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/fr-FR/BirthdayWishes.fr-FR.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/fr-FR/BirthdayWishes.fr-FR.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/fr-FR/SpouseBirthdayWishes.fr-FR.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/fr-FR/SpouseBirthdayWishes.fr-FR.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/fr-FR/SpouseBirthdayWishes.fr-FR.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/fr-FR/SpouseBirthdayWishes.fr-FR.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/fr-FR/TranslatedStrings.fr-FR.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/fr-FR/TranslatedStrings.fr-FR.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/fr-FR/TranslatedStrings.fr-FR.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/fr-FR/TranslatedStrings.fr-FR.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/hu-HU/BirthdayWishes.hu-HU.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/hu-HU/BirthdayWishes.hu-HU.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/hu-HU/BirthdayWishes.hu-HU.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/hu-HU/BirthdayWishes.hu-HU.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/hu-HU/SpouseBirthdayWishes.hu-HU.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/hu-HU/SpouseBirthdayWishes.hu-HU.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/hu-HU/SpouseBirthdayWishes.hu-HU.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/hu-HU/SpouseBirthdayWishes.hu-HU.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/hu-HU/TranslatedStrings.hu-HU.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/hu-HU/TranslatedStrings.hu-HU.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/hu-HU/TranslatedStrings.hu-HU.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/hu-HU/TranslatedStrings.hu-HU.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/it-IT/BirthdayWishes.it-IT.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/it-IT/BirthdayWishes.it-IT.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/it-IT/BirthdayWishes.it-IT.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/it-IT/BirthdayWishes.it-IT.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/it-IT/SpouseBirthdayWishes.it-IT.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/it-IT/SpouseBirthdayWishes.it-IT.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/it-IT/SpouseBirthdayWishes.it-IT.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/it-IT/SpouseBirthdayWishes.it-IT.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/it-IT/TranslatedStrings.it-IT.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/it-IT/TranslatedStrings.it-IT.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/it-IT/TranslatedStrings.it-IT.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/it-IT/TranslatedStrings.it-IT.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/ja-JP/BirthdayWishes.ja-JP.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/ja-JP/BirthdayWishes.ja-JP.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/ja-JP/BirthdayWishes.ja-JP.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/ja-JP/BirthdayWishes.ja-JP.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/ja-JP/SpouseBirthdayWishes.ja-JP.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/ja-JP/SpouseBirthdayWishes.ja-JP.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/ja-JP/SpouseBirthdayWishes.ja-JP.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/ja-JP/SpouseBirthdayWishes.ja-JP.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/ja-JP/TranslatedStrings.ja-JP.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/ja-JP/TranslatedStrings.ja-JP.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/ja-JP/TranslatedStrings.ja-JP.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/ja-JP/TranslatedStrings.ja-JP.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/ko-KR/BirthdayWishes.ko-KR.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/ko-KR/BirthdayWishes.ko-KR.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/ko-KR/BirthdayWishes.ko-KR.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/ko-KR/BirthdayWishes.ko-KR.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/ko-KR/SpouseBirthdayWishes.ko-KR.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/ko-KR/SpouseBirthdayWishes.ko-KR.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/ko-KR/SpouseBirthdayWishes.ko-KR.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/ko-KR/SpouseBirthdayWishes.ko-KR.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/ko-KR/TranslatedStrings.ko-KR.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/ko-KR/TranslatedStrings.ko-KR.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/ko-KR/TranslatedStrings.ko-KR.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/ko-KR/TranslatedStrings.ko-KR.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/pt-BR/BirthdayWishes.pt-BR.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/pt-BR/BirthdayWishes.pt-BR.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/pt-BR/BirthdayWishes.pt-BR.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/pt-BR/BirthdayWishes.pt-BR.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/pt-BR/SpouseBirthdayWishes.pt-BR.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/pt-BR/SpouseBirthdayWishes.pt-BR.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/pt-BR/SpouseBirthdayWishes.pt-BR.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/pt-BR/SpouseBirthdayWishes.pt-BR.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/pt-BR/TranslatedStrings.pt-BR.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/pt-BR/TranslatedStrings.pt-BR.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/pt-BR/TranslatedStrings.pt-BR.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/pt-BR/TranslatedStrings.pt-BR.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/ru-RU/BirthdayWishes.ru-RU.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/ru-RU/BirthdayWishes.ru-RU.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/ru-RU/BirthdayWishes.ru-RU.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/ru-RU/BirthdayWishes.ru-RU.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/ru-RU/SpouseBirthdayWishes.ru-RU.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/ru-RU/SpouseBirthdayWishes.ru-RU.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/ru-RU/SpouseBirthdayWishes.ru-RU.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/ru-RU/SpouseBirthdayWishes.ru-RU.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/ru-RU/TranslatedStrings.ru-RU.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/ru-RU/TranslatedStrings.ru-RU.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/ru-RU/TranslatedStrings.ru-RU.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/ru-RU/TranslatedStrings.ru-RU.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/tr-TR/BirthdayWishes.tr-TR.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/tr-TR/BirthdayWishes.tr-TR.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/tr-TR/BirthdayWishes.tr-TR.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/tr-TR/BirthdayWishes.tr-TR.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/tr-TR/SpouseBirthdayWishes.tr-TR.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/tr-TR/SpouseBirthdayWishes.tr-TR.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/tr-TR/SpouseBirthdayWishes.tr-TR.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/tr-TR/SpouseBirthdayWishes.tr-TR.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/tr-TR/TranslatedStrings.tr-TR.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/tr-TR/TranslatedStrings.tr-TR.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/tr-TR/TranslatedStrings.tr-TR.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/tr-TR/TranslatedStrings.tr-TR.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/zh-CN/BirthdayWishes.zh-CN.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/zh-CN/BirthdayWishes.zh-CN.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/zh-CN/BirthdayWishes.zh-CN.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/zh-CN/BirthdayWishes.zh-CN.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/zh-CN/SpouseBirthdayWishes.zh-CN.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/zh-CN/SpouseBirthdayWishes.zh-CN.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/zh-CN/SpouseBirthdayWishes.zh-CN.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/zh-CN/SpouseBirthdayWishes.zh-CN.json diff --git a/GeneralMods/HappyBirthday/Content/Dialogue/zh-CN/TranslatedStrings.zh-CN.json b/GeneralMods/HappyBirthday/ModAssets/Dialogue/zh-CN/TranslatedStrings.zh-CN.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Dialogue/zh-CN/TranslatedStrings.zh-CN.json rename to GeneralMods/HappyBirthday/ModAssets/Dialogue/zh-CN/TranslatedStrings.zh-CN.json diff --git a/GeneralMods/HappyBirthday/Content/Gifts/BirthdayGifts.json b/GeneralMods/HappyBirthday/ModAssets/Gifts/BirthdayGifts.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Gifts/BirthdayGifts.json rename to GeneralMods/HappyBirthday/ModAssets/Gifts/BirthdayGifts.json diff --git a/GeneralMods/HappyBirthday/Content/Gifts/SpouseBirthdayGifts.json b/GeneralMods/HappyBirthday/ModAssets/Gifts/SpouseBirthdayGifts.json similarity index 100% rename from GeneralMods/HappyBirthday/Content/Gifts/SpouseBirthdayGifts.json rename to GeneralMods/HappyBirthday/ModAssets/Gifts/SpouseBirthdayGifts.json 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/ModCore.cs b/GeneralMods/StardustCore/ModCore.cs index 087d44d1..060556e1 100644 --- a/GeneralMods/StardustCore/ModCore.cs +++ b/GeneralMods/StardustCore/ModCore.cs @@ -29,15 +29,15 @@ namespace StardustCore Manifest = this.ModManifest; IlluminateFramework.Colors.initializeColors(); - ContentDirectory = "Content"; - if (!Directory.Exists(ContentDirectory)) Directory.CreateDirectory(Path.Combine(ModHelper.DirectoryPath, "Content")); + ContentDirectory = "ModAssets"; + if (!Directory.Exists(ContentDirectory)) Directory.CreateDirectory(Path.Combine(ModHelper.DirectoryPath, "Assets")); SpriteFonts.initialize(); TextureManagers = new Dictionary(); TextureManager = new TextureManager("StardustCore"); - 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,Manifest,Path.Combine("Assets", "Graphics", "MultiTest", "Test1.png"))); + //TextureManager.addTexture("Test2", new Texture2DExtended(ModCore.ModHelper,Manifest, Path.Combine("Assets", "Graphics", "MultiTest", "Test2.png"))); + //TextureManager.addTexture("Test3", new Texture2DExtended(ModCore.ModHelper, Manifest,Path.Combine("Assets", "Graphics", "MultiTest", "Test3.png"))); TextureManagers.Add(this.ModManifest.UniqueID, TextureManager); this.Helper.Events.GameLoop.GameLaunched += this.GameLoop_GameLaunched; @@ -49,10 +49,10 @@ namespace StardustCore private void GameLoop_GameLaunched(object sender, StardewModdingAPI.Events.GameLaunchedEventArgs e) { - string soundbankPath=Path.Combine(Game1.content.RootDirectory, "XACT", "Sound Bank.xsb"); - Directory.CreateDirectory(Path.Combine(this.Helper.DirectoryPath, "ProcessedGameFiles")); + //string soundbankPath=Path.Combine(Game1.content.RootDirectory, "XACT", "Sound Bank.xsb"); + //Directory.CreateDirectory(Path.Combine(this.Helper.DirectoryPath, "ProcessedGameFiles")); //this.Monitor.Log(Utilities.HexDumper.HexDumpString(soundbankPath), LogLevel.Info); - Utilities.HexDumper.StripSoundCuesToFile(Path.Combine(this.Helper.DirectoryPath, "ProcessedGameFiles", "SoundCues.json"),Utilities.HexDumper.StripSoundCuesFromHex(Utilities.HexDumper.HexDumpString(soundbankPath))); + //Utilities.HexDumper.StripSoundCuesToFile(Path.Combine(this.Helper.DirectoryPath, "ProcessedGameFiles", "SoundCues.json"),Utilities.HexDumper.StripSoundCuesFromHex(Utilities.HexDumper.HexDumpString(soundbankPath))); //Utilities.HexDumper.HexDumpFile(soundbankPath, Path.Combine(this.Helper.DirectoryPath, "ProcessedGameFiles", "SoundCuesRaw.json")); } diff --git a/GeneralMods/StardustCore/StardustCore.csproj b/GeneralMods/StardustCore/StardustCore.csproj index 2dd75a66..8d58030b 100644 --- a/GeneralMods/StardustCore/StardustCore.csproj +++ b/GeneralMods/StardustCore/StardustCore.csproj @@ -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